Fix deprecated method/function warnings with rustc master

diff --git a/src/cargo/core/manifest.rs b/src/cargo/core/manifest.rs
index 174e751aa8b22add9930a3b28311919ccfd70445..dc6d27f635ae6323d8b45882dd94377edb8973e5 100644 (file)
--- a/src/cargo/core/manifest.rs
+++ b/src/cargo/core/manifest.rs
@@ -1,5 +1,4 @@
 use std::hash;
-use std::result;
 use std::fmt::{mod, Show, Formatter};
 use semver::Version;
 use serialize::{Encoder,Encodable};
@@ -85,7 +84,7 @@ impl LibKind {
     }
 
     pub fn from_strs<S: Str>(strings: Vec<S>) -> CargoResult<Vec<LibKind>> {
-        result::collect(strings.iter().map(|s| LibKind::from_str(s.as_slice())))
+        strings.iter().map(|s| LibKind::from_str(s.as_slice())).collect()
     }
 
     pub fn crate_type(&self) -> &'static str {

diff --git a/src/cargo/ops/cargo_compile.rs b/src/cargo/ops/cargo_compile.rs
index 1c35a0f2ea96b76474de2eb688328061b178a328..8b686af2d75badee6ce07f0d8e72dc6081c32f3b 100644 (file)
--- a/src/cargo/ops/cargo_compile.rs
+++ b/src/cargo/ops/cargo_compile.rs
@@ -24,7 +24,6 @@
 
 use std::os;
 use std::collections::{HashMap, HashSet};
-use std::result;
 
 use core::registry::PackageRegistry;
 use core::{MultiShell, Source, SourceId, PackageSet, Target, PackageId};
@@ -147,9 +146,9 @@ fn source_ids_from_config(configs: &HashMap<String, config::ConfigValue>,
 
     // Make sure we don't override the local package, even if it's in the list
     // of override paths
-    result::collect(paths.iter().filter(|p| {
+    paths.iter().filter(|p| {
         cur_path != os::make_absolute(&Path::new(p.as_slice()))
-    }).map(|p| SourceId::for_path(&Path::new(p.as_slice()))))
+    }).map(|p| SourceId::for_path(&Path::new(p.as_slice()))).collect()
 }
 
 fn scrape_target_config(config: &mut Config,

diff --git a/src/cargo/sources/git/source.rs b/src/cargo/sources/git/source.rs
index ff8ef9ad9c8b618ff57c5c0bfe8c274df5c4f28f..b0198dd950aff79638575d29e707c8c13726a111 100644 (file)
--- a/src/cargo/sources/git/source.rs
+++ b/src/cargo/sources/git/source.rs
@@ -195,7 +195,7 @@ impl<'a, 'b> Source for GitSource<'a, 'b> {
     }
 
     fn fingerprint(&self, _pkg: &Package) -> CargoResult<String> {
-        Ok(self.rev.get_ref().to_string())
+        Ok(self.rev.as_ref().unwrap().to_string())
     }
 }
 

diff --git a/src/cargo/util/toml.rs b/src/cargo/util/toml.rs
index e4ea5ba99007f5b8353098146d39f59de73815b7..117b68d629c46d289782fea3272f933c6ff21f06 100644 (file)
--- a/src/cargo/util/toml.rs
+++ b/src/cargo/util/toml.rs
@@ -396,10 +396,10 @@ impl TomlManifest {
             None => inferred_test_targets(layout),
         };
 
-        let benches = if self.bench.is_none() || self.bench.get_ref().is_empty() {
+        let benches = if self.bench.is_none() || self.bench.as_ref().unwrap().is_empty() {
             inferred_bench_targets(layout)
         } else {
-            self.bench.get_ref().iter().map(|t| t.clone()).collect()
+            self.bench.as_ref().unwrap().iter().map(|t| t.clone()).collect()
         };
 
         // Get targets